Fixing up some code stuff