- fixes for strawberry 5.20 by kmx - thank you!