Fixing build - adding more missing files.