Package updates and cleanup