#11 fixes for unbundle