Contrib's and apn updates