Bugfixes to Unit operands