Fix helpers and move functions