Fixing problems with completion handler and conversion on older compilers.