Last minute fixes for stuff.