Aaaaand yet more fixes.