Update common and rebuild