Fix for Bug 447104 and other minor fixes