Adjust code to framework changes.