Fix module import and calls