More bug fixes for judges feedback.