Fixes for compatibility with MRB_INT16