Try and get packages right