* fix changes that made commonapi generation not working