Oops, didn't actually push all the fixes for the last commit