bug 960325 - Fix small changes