Nilavu fixes 26, 27, 28