fixes for these (at least)