Fix some ugly bugs on water generation (still remain most of them)