Fixed some failures