updates, working on gcc4.8 compat