Finished fixing all BC breakage from the lib update