Fixed a couple PSO bugs.
This is the work we did together inlab.

Signed-off-by: loganperreault <perreault.logan@gmail.com>