[PLXCOMP-226] Use long instead of int