Add last chunk of fixes