Couple of missing things (some my falt some not :P)

Signed-off-by: emanuele <emanuele45@gmail.com>