[TASK] Some compatibility fixes