Fixes to allow package to build