Mssa fixes