Fix some errors in the assembly