fix import/delay import parsing
Fix some warnings