Some small QoL fixes