Some smaller improvements...