Enable defines to get it passing again