add constexpr in few more critical places