Hotfixes

Signed-off-by: estebansanti <esteban@pixelban.com>