Some fixes for silly mistakes.

I never actually compiled it last time! Was in too much of a rush!