Fixes per @siminm comments.