added some compat features