More rmtree fixes