Fix derps all around the place