A few last fixes