bug fixes. prepare to support Errai 3.0 model