eleventh-hour fixes