Fix potential crash due to str+nil concat.
Refueling fixes.
Remove debug prints.