A few last minute tweaks