Fixed bugs in Waterhouse 1.0