few fixes ...