I have the later version - and still have the problems with the defines. No matter what I've tried this problem persists - even pulled those defines into the core language files. Someone else said these fixes were the solution. The ZC version is 1.5.7b.