Remove some of the warnings

Correct a few of the scenario's to avoid warnings