Fix weirdness with assembly state and block updates