- Some more minor changes