Fix dyndata layout