zcml fixes