a few prototype fixes