CS/SLI fixes.
Merge pull request #7 from solocommand/master

CS/SLI fixes.