Bug 894958 - Small fixes for Linux.