Fixes due to testcase failures