A few last-minute fixes