Small bug fixes in Waterfloo.