Some last-minute fixes