Minor prototypes changes