More Constants.h updates