Fix module builds