osl-9999: some fixes, but need more