Bug 929 : Last follow up, implementing the last of Katrins suggestions