Misc customer fixes

FYI, having a default like this can behave un-deterministically if you ever need the string value. You're probably not using it like that though.