Apply recent updates from original repo