Test the setting time and bulk density, and adjust the formula accordingly. If your original formula has no air-entraining agent and retarder, you can only use it sparingly. It is OK to add some defoamer, but the available defoamer for the naphthalene-based is relatively small; you can buy some Calcium lignosulfonate (to be pure) as a defoamer.