fix compatibility problems;