Fix up some prototype issues