Some minor to do's