Protosketch repairs

Addresses issues with #443

Probably could have pushed these right to staging, but for the sake of transparency, opening a whole new PR.