fixed broken & missing defines