Humanize fixes