Rules + dictionary fixes