Added additional fixes