Startup lock shouldn't engage on config reload

Also fix animal protection to detect empty hands correctly.