Fixing up some things!