fix success/error message variables