Fixed issues raised by Chris