Made more fixes.