Some fixes including rimraf