more modularization fixes

Change-Id: I99ba3aa04947b7c2461284ed781ab433a266d997