Fixed some solution problems