Fix pre-c++2011 + improved waterfall effect