Fix some selection errors with move