further fixes in filler, for #1513