Bug 1028269 - Tweaks as per user request