Generic Unit Of Work bugs