#9 Some fixes