Last Minute Fixes

Various Last Minute Fixes