Fix packages definitions