More proto tweaks