Last  fixes