Various SQLi Changes