Improved rules to reduce ambiguities