prototyper fixes