Package updates and bug fixes