Fixed OSIS namespace issues