Fix bugs

Next commit : Fix require blank line between 2 import