Fix incompatibilites with frodo
Fix breakage due to cookielaws