small fixes to work