small fixes, 25 failing