Fixing some syntax issues