vampire: portability fixes

These have been submitted upstream,
but seconds before writing this message
so naturally no upstream response "yet" :).

Regardless of response, fetch patches
from the corresponding PR's for context
and of course hopefully they'll
be included in next version.