Added constexpr to macros
Fixed slip