Small changes, including fixing objdump output, etc.