Adjust to recent changes