Some more SQL fixes