Bug fixes from unusal states