Small  fixes