Trying to fix some things