#9 Some fixes 2