Some more mnor fixes