Moved more OSI from lab.
Fix compiling for OSI.