Fixed some package definition stuff