Fixes from testing full provisioning