Fixing validation errors on cze's working branch.