Fix some bugs from the hslibvoyeur switchover