a few last fixes