Even more minor changes