Try and fix some things