Minor changes to prototypes