More c++14 compliance