Quick bug fixes. I hate leaving things unfinished.