Work small fixes