A few last minute fixes before release