Others fixes on general

Others fixes on general