Fixed nagios-wrapper/simple-wrapper handling