A few fixes more