Minor OKS Edits

Fix for Issues #123 and #124