Changes according to rail review https://bugzilla.mozilla.org/show_bug.cgi?id=772190#c37
Further small changes related to rail review