Fixes for 2-byte dof_id_type