Fixing some packaging issues (build time)