Fix models due to sonar changes in common