Additional fixes.

Some commits were missing and one of the SVG images got messed up during the merge. This is fixed now.