Fix up some copy pasta issues