Fixed things related to the Common changes