Bugfixes to callee mode