Fixes various observations

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>