Fix some reactivity issues, and correct subset