Fixing bugs in the job + SimpleClient