Bugs fixes added.