Adding additional fixes