Fix items from mozilla review. Closes #4374.