common fixes
common fixes