fixes for nightly devzip