adding more fixes.