adjust code to changes from common updates