a some fixes