Important bug fixes.