make fill missing optional everywhere