Fix compile errors caused by package moves / renames