VampireAE fixes, mmm'kay
Merge pull request #2061 from davilla/vamp-fixes

VampireAE fixes, mmm'kay