Fixes on solution 8.