next couple of prototype fixes