Some  fixes