Lets fix some things