Fix some weirdness with 'rm', and a couple of compile errors.