Display fixes.

see #585