ObjectUtils and some fixes