Fixes searchableset and delegate(with generics) related bugs