Manual merge of rafgc's patch 11.

Minor visual fixes.