Adjust after pull from master