Patch 5 - Important bug fixes.