Misc changes

Signed-off-by: Duarte Nunes <duarte.m.nunes@gmail.com>