Some changes due to prepration for new fork