More fixes required to pass test cases