1.6 Deprecation Fixes

Move update_wrapper
fixed url imports