#4 fixes for unbundle