Fixes per pekkaklark's review