A lot of different fixes