More Fixes to base package.