Minor tweaks to fix some inconsistencies