Updates and bugfixes related to Lister