Updated with remainder of fixes