Updated fixes to XosLib source