Some last minute fixes!