Fix some atomic tactics