Various update for bug fixes.