Fix a couple of spec failures on 1.8.7
Fix a couple of spec failures on 1.8.7

rom-rb/rom,kwando/rom,pxlpnk/rom,cored/rom,pdswan/rom,rom-rb/rom,Snuff/rom,jeremyf/rom,pvcarrera/rom,endash/rom,dcarral/rom,rom-rb/rom,dekz/rom,denyago/rom,vrish88/rom