Improved two loop quark mass corrections