Fix last minutes errors.