Fix a few issues but still fail.