#13 Some fixes