More & more fixes.