Fixing issues noted by Anthony Borrow