Fixed a few small setup errors