swrepo fixes