Syncing some misc. changes.