Solving Bugs detected by jFed client