college bug fixes. #3607