Fixes for list_bundle + cleanup