Fixed some compatible problems