Fixes for Round 5 issues.