Fixed compatability errors