Some compatability fix