Fix messages bundles