Fixed some things that got broken on last merge