Fixed some issues in  module loader