Fixed a few problems with failing specs (cherry picked from commit 70a7731340924e44d918bef0a8f28308feec1938)
Fixed a few problems with failing specs
(cherry picked from commit 70a7731340924e44d918bef0a8f28308feec1938)

EOL/capstone_eol,kidaa/eol,EOL/capstone_eol,DanielZhangQingLong/eol4,EOL/capstone_eol,EOL/capstone_eol,kidaa/eol,EOL/capstone_eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,kidaa/eol,EOL/capstone_eol,kidaa/eol,DanielZhangQingLong/eol4