Fixed a few last minute issues