Fixes and Improvements

Signed-off-by: Alysson Bortoli <akbortoli@gmail.com>