Minor fixes so package builds again.