Just some fixes. :)