Fix layout refs.