Features/repo base path

A couple of small changes for snapshot/restore