Fix exercises solutions :)