Some additional fixes