Fix Nate's issues.

'cause he's too stubborn to do it himself.