Bug 2474 few more changes