Fix some bugs on OS Reader Import

#3715 

Work in progress.