More prototype/lib improvements