Bug 502 improvements