Fixing message display bugs