another small fixes