tweaks to proto 2