fix linking errors due do cyclic dependencies for now