More Fix + Defines