2e51cd5 small fixes