Fixes per pekkaklarck's review