Many more fixes