Added a couple of missing package pieces.