~ small fixes