Commands should terminate properly. Also fixes fake claiming in database issue.