Temp fixes for bundles