Fixed some small issues related to the KFSDataObject merge.
Merged my fixes.