WIP: fix broken packages