4.7 bug fixes

bug fix from 4.6