added additional fixes