Fix suggestions from Rob