Fixed some errors

(cherry picked from commit 5f673918f7c1638794c7024bc0631daff65282de)
Two more replace module import rules