Fix packages and symbols.