JCinDE:
	- More fixes
