more fixes for when excluding a factor