Fix some failures
Fix some failures