director: Fixes for new API