Fix builds errors