Issue #4 - Fixes remaining MySQL issues