Fixed another couple of compile errors, currently compilable up to model-impl (problems with scripting there). Besides one test in provisioning-impl.