Yet another small fixes