Buffer and progress hotfixes for 5.3.1, #224