Fix base package