Fix solutions to meet new requirements.