A couple fixes

I'll find more tonight, left my notes at home. Hold on for a while.