Fixes for the OS reader

#3455