#6 Some fixes