Minor WS fixes

Just some minor fixes I got some highlights on in QC.