Added fixes for: MYSQLG-57, MYSQLG-56, MYSQLG-54