Update fix to c++11
Update always and regular adaptor