Minor changes and a fix for MySql while case sensitive.