More auto attack fixes