misc  fixes