Fixed a few macros based on outdated numerics
Added RPL_ISUPPORT support