Minor display enhancements / corrections