Updates to resolve build failures