Fix fire listener and clean up imports