TSAGE: Bugfixes for R2R drive room