Prototype: Various fixes.