Some more minor changes