fixes for two failing test cases