Fixes/bundle normalization