Some last minute fixes