Add next chunk of fixes