Matcha::connect - Fixing some class issues.