Fixing some onesix build issues.