Writing fixes