Fix scheduling and room assignment

Fixes #94