Move a couple things around