Minor tweaks to fix assorted small issues in constants and updatedb