Making some fixes to waf tutorial