Prototype fixes