Minor tidy up. Also ignore time limit if creating file.