Surefire improvements