Fixed some things broken by merges