A few fixes here and there