Bugfixes for rhs evaluations