Fixes for nightly fallout

Originally based on https://github.com/hackndev/zinc/pull/137