OperatorOverloading: Small fixes