Fix three display bugs