Mysql mapper fixing minor bugs