Fix final HAVING issues.