fix some un-needed fail whales