Last fixes in fuel_agent

Change-Id: I19f2ccc3a01fd6053c5ee557256a5d4a0acabda0