..F....... [DEV-537] several small fixes