Just some small beauty fixes