more fixes everywhere