fixes based on the ultimate testing on Eden Mysql.