Small fixes in the package model classes