Bug 1024715 - more fixes for review R=zacc