Fixes from George Hansper