* fix some compat issue