couple of prototype correction