Phase02 bugfixes