Guest display bugfixes