Fix tricky PB::Model::Generator bugs; moritz++