Bugfixes to X and svg