few changes for ios6
nm