Solved all compatibility problems