Minor fixes for room time-control