fixes from #dev by rcotrina94