Just some quality of life improvments