+ Some small fixes