Improve some operator functions