Brakeman fixes