Some small fixes