Minor comment and assembly fixes