Fix modules

Change-Id: I7fdb9079d97937c6327fb383b0cf1c7f9b26c628