Bug 1024715 - fixes for review R=zacc