Address some (but not all) of Martin's comments from bug tracker