last minute fixes to comply with submission req.