Changes for issues 3169 and 3175

Changes for simple presentation issues.