Fixes in prototypes, v1 and v2