Fixes to location change handling and give mode forbidden.  Fixes #646.