diff --git a/heartbeat/galera b/heartbeat/galera
index 6d8cf12..a3e5c90 100644
--- a/heartbeat/galera
+++ b/heartbeat/galera
@@ -79,7 +79,7 @@ fi
 
 usage() {
   cat <<UEND
-usage: $0 (start|stop|validate-all|meta-data|monitor|promote|demote|notify)
+usage: $0 (start|stop|validate-all|meta-data|monitor|promote|demote)
 
 $0 manages a galera Database as an HA resource.
 
@@ -235,9 +235,8 @@ Cluster check user password
 <action name="monitor" depth="0" timeout="30" interval="20" />
 <action name="monitor" role="Master" depth="0" timeout="30" interval="10" />
 <action name="monitor" role="Slave" depth="0" timeout="30" interval="30" />
-<action name="promote" timeout="120" />
+<action name="promote" timeout="300" />
 <action name="demote" timeout="120" />
-<action name="notify" timeout="90" />
 <action name="validate-all" timeout="5" />
 <action name="meta-data" timeout="5" />
 </actions>
@@ -532,7 +531,7 @@ galera_start()
 
     is_readonly
     if [ $? -ne 0 ]; then
-        ocf_log err "Failure. Slave instance did not start correctly in read-only mode, Make sure local galera.cnf does not have wsrep_cluster_address set."
+        ocf_log err "Slave instance did not start correctly in read-only mode, Make sure local galera.cnf does not have wsrep_cluster_address set."
         return $OCF_ERR_GENERIC
     fi
 
@@ -672,7 +671,7 @@ fi
 
 MYSQL_OPTIONS_CHECK="-nNE --user=${OCF_RESKEY_check_user}"
 if [ -n "${OCF_RESKEY_check_passwd}" ]; then
-    MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${MYSQL_PASSWORD}"
+    MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${OCF_RESKEY_check_passwd}"
 fi
 
 # What kind of method was invoked?
@@ -683,7 +682,6 @@ case "$1" in
   monitor)  galera_monitor;;
   promote)  galera_promote;;
   demote)   galera_demote;;
-  notify)   galera_notify;;
   validate-all) exit $OCF_SUCCESS;;
 
  *)     usage