small fixes that came over time