Touched up defines again to resolve issues on compile.