Fix Location Bugs

Fixes Location bugs in Motion and Writer
@stowellm