Last minute fixes...