Adding missing files, fixing build for IOS