Last minute fixes

I hate bugs.