few more fixes of the core