Fixed modules build after recent changes

Change-Id: Ib5cc5216365f244014da17d394a7d97730de0bbe