a few last minute fixes