Adds small tweaks based on Scrutinizer CI feedback. Fixes the nonce values.