Added some constexpr's for C++11