Even more minor fixes