[#239] Minor improvements from @autofunk