Fix some failures