Fixed things lost on merge.