Small fixes based on Chewett's comments