Fix cyclical dependencies in immibis core