Fixing up some more stuff..