[#54] Make sure we have the proper type for using Long/valueOf