moving small fixes