Fixes in metadata rules