Added more fixes.