Minor fixes 10.3