Fix lab5 and lab6 solved