Some smaller improvements