Fixed package setup