A lot more fixes