various fixing from following the codelab step by step [on Linux]

to reflect the changes in previous step.