Jeremy Newman : fix bugs by my link as suggested in bug 9285