Small fixes
Small fixes 2
Small fixes 3