Introduce some last-minute fixes