Draft fixes