Updated some package references and resolved binding issues