several different fixes