fix some specific stuff