Minor changes

Hi Mustafa, 

I made some smaller changes in preparation of my works, maybe you'll find something useful there for iOS too. 

Cheers,
Dirk