Fix up remaining items in normal build.