This set of patches is breaking up the previous patch I had sent into a patch for each package. This is to allow them to be reviewed and commited easier. I will mark my previous patch as superseded.