more prototype fixes