Fix problems with "clean" installations (#19)