more branching work; fix deprecation warning