Fixes from dev by rcotrina94