Minor fixes to solution.