Fixing up multi module build