Bugfixes with operator