Minor fixes 2