Some hardening to avoid easy errors with datatypes