5659 front end fixes