Fix some syntax issues