[SA] working on fixes