Small QoL fixes