Fixing up function prototypes