More small improvements and tweaks