Small changes to Defines