Commit 10.2: Some fixes for new rules