Another portion of fixes