few more necessary fitting fixes...