Merge "Fix assembler warnings."