fixes for zirgo migration for --setup