waterfall fixes