Fix build, remove doubles, add missing strings