Fixing resourcebundle issues