The last minute bits of fixes