Minor fixes 1