Significant bug fixes.