Implement necessary changes after sync with fork