Changes made for the common build