Some small fixes here and there