Fix stuff from bad pull