Minor fixes 21 and 22