fix issues from 4.5 upgrade