Hoping this was everything I fixed... otherwise I'm in for a world of
pain.