Misc updates to workaround repo support