TSAGE: Fixes for R2R scanner dialog