Bug 960894 follow-up: minor fixes