A tad more fixes.