Moved operators to member functions to test on OSX