Changes from thehyve repo