- Some small fixes