Fix some compatible problems