Fix mismatched types.
Add new files (originally added to iOS version).