Updated SirTrevor & Underscore to compatible versions