Package updates
Fix references