Minor tweaks, moved to mysql