Many more fixes for next update