Fix swap path, add utility bundles