Merged in Riad's svg fixes.