More Last Minute Fixes

Fixed a few issues.