Added common fixes