Bug 1085338 - Fixed mentioned issues