Some small fixes...