[PATCH] x86_64: Some fixes for single step handling