More  fixes