Fix issues in innvent/vandal2#142.