fixes on fixes