Fix some package errors