Included more fixes.