Minor fixes in assembly