Horray for some bug fixes