Bug fixes and performance fixes.