Fixed issues for last weeks assignment