Fix some RFC2119 discrepencies