Several additional fixes