Fix issues with rake and redefined constants