some adjustments due to recent interface changes