Added missing files, fixed build errors.