Package commands fixes.