Fix build issues caused by deps

This fixes a few build issues caused by changes in upstream libraries.