Fixed some things up