Fix display errors from earlier refactoring