Last minute fixes!