Made things work after the last merge.