Fix module problems