UDID fix and some warning fixes