again small fixes