668e90b small fixes