Fixed core module build