Applaying common fixes.