Adjustments from comments by @bicpi