Changes made for common build