Fix some weird public display issues