Fix things that didn't get merged for some reason

Fix things that didn't get merged for some reason. Attempt to fix msfvenom rspec.