Vampire fixes as posted by suspicious in the thread