few fixes again