various fixups to allow start outside of folder