Fix semester-related issues
Fix error from empty "taken" list