fixes per @lordnull's review