Fixed issues related to upgraded dependencies.