Fixed messages in commands and NPEs