Bring in updates from original fork