Issue fixed with tags, and conflict with int32 redefinition resolved