Fix issues in package which prevent build