Minor fixes for x86 code analysis