Some small tweaks to values