small fixes to work everywhere