Fixing build errors for "removing activation code"