Just a few last minute tidy ups