Update repositories and minor fixup