a few insertable state fixes