few last fixes