Tweak Makefile
Fix a warning
constexpr-ize