Fix logging bug
Fix module imports