Add tentative fixes
Merge pull request #1 from wvu-r7/pr/1215

Tentative fixes for rapid7/metasploit-framework#1215