Try and fix stuff