Patches for new Hawkejs v1 + better logging