Fixed some things in place