This ticket will be used for collecting a number of patches to the NIM code base to either add stability or resolve minor issues. These changes should be pulled up and incorporated into the next release of KFW built off of the 1.6 branch.