Fixed !ns and !raw missing procedures.