fixing some failures