Fixed package defs