ZetaProject rc1 bugfixes