SUmming up bugfixes (2.3.7.1)