Some vampire fixes