Fix some minor compile errors and user strings.