Final (hopefully) commit to fix local repo strangeness