compatibility fixes for current master