assembly fixes