Removed fatal errors in conversion from iOS