fixed some failures