Some changes due to errai updates