Tough fixes