Small tweaks to match signed/unsigned vars and printf args