Fixing some annoyances I've had