Some ugly changes i need to work on my environment

Signed-off-by: Andres Garcia <andresgarcia@gmail.com>