fixes for non-cuckoo release build