Point and motion fixup