fix stuff broken due to list support changes