Very minor updates to helpers and state