Syncing changes to pick up Shawn's fixes