Fix packages, add exception