Changed some operator types