More improves

Signed-off-by: Leandro Cortese <leandrocortese@gmail.com>