Couple of bug fixed in rcp packages