Fix module debug and more