Rule fixes