Fix some problems with forall_then