Minor OKS Edits

Fix for Issues #122 and #124