fixes in classes of package model