Polish fixes according to test cases