Lots of eleventh hour fixes