Fixes issues reported by Mary Barnes