More mysql compatibility work