Some small QoL changes