fixing issues after running through validator.

One should be fixed, 2 not sure how to fix.