Fix two display bugs
Bug fixes