A few guide display fixes