fix some bad guys