A few last tweaks