unlink fixes via matt-c