Update sources to grab upstream fixes