Movement detection tweaks